Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtbase: use more than one core to build qmake #168086

Merged
merged 1 commit into from Apr 13, 2022
Merged

qtbase: use more than one core to build qmake #168086

merged 1 commit into from Apr 13, 2022

Conversation

ghost
Copy link

@ghost ghost commented Apr 10, 2022

Description of changes

The qtbase package's configurePhase builds the qmake tool. In the current nixpkgs expression it does this single-threadedly, by invoking make without a -j flag.

Let's thread NIX_BUILD_CORES through to ./configure's invocation of make via the MAKEFLAGS variable.

On high-core-count machines the build of qtbase is much faster with this commit.

Things done
  • Built on platform(s)
    • x86_64-linux (done)
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • powerpc64el-linux (done)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Fits CONTRIBUTING.md.

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but due to the amount of rebuilds this should go to staging.

@ghost ghost changed the base branch from master to staging April 12, 2022 04:08
@ghost
Copy link
Author

ghost commented Apr 12, 2022

LGTM but due to the amount of rebuilds this should go to staging.

Done.

@ghost
Copy link
Author

ghost commented Apr 12, 2022

Squashed.

The qtbase package's `configurePhase` builds the `qmake` tool.  In the
current nixpkgs expression it does this single-threadedly, by invoking
`make` without a `-j` flag.

Let's thread `NIX_BUILD_CORES` through to `./configure`'s invocation
of `make` via the `MAKEFLAGS` variable.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@Artturin
Copy link
Member

Artturin commented Apr 13, 2022

@ofborg build qt5.qtbase

@SuperSandro2000 SuperSandro2000 merged commit 4c8c13b into NixOS:staging Apr 13, 2022
@ghost ghost deleted the qtbase-use-parallel-make branch April 13, 2022 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants